Rename qv4ir_p.h to qv4jsir_p.h to avoid conflict with qtdeclarative

Change-Id: I0e222141232f191e47950318f8262144de486703
Reviewed-by: Lars Knoll <lars.knoll@digia.com>

21 files changed, 24 insertions, 24 deletions

diff --git a/src/v4/moth/qv4isel_moth_p.h b/src/v4/moth/qv4isel_moth_p.h
index c6677f23..161fbf35 100644
--- a/src/v4/moth/qv4isel_moth_p.h
+++ b/src/v4/moth/qv4isel_moth_p.h
@@ -3,7 +3,7 @@
 
 #include "qv4global.h"
 #include "qv4isel_p.h"
-#include "qv4ir_p.h"
+#include "qv4jsir_p.h"
 #include "qv4object.h"
 #include "qv4instr_moth_p.h"
 
diff --git a/src/v4/qmljs_runtime.cpp b/src/v4/qmljs_runtime.cpp
index 1f737534..4f88f3f6 100644
--- a/src/v4/qmljs_runtime.cpp
+++ b/src/v4/qmljs_runtime.cpp
@@ -43,7 +43,7 @@
 #include "debugging.h"
 #include "qmljs_runtime.h"
 #include "qv4object.h"
-#include "qv4ir_p.h"
+#include "qv4jsir_p.h"
 #include "qv4objectproto.h"
 #include "qv4globalobject.h"
 #include "qv4stringobject.h"
diff --git a/src/v4/qv4_llvm_p.h b/src/v4/qv4_llvm_p.h
index 60625c86..d9390f42 100644
--- a/src/v4/qv4_llvm_p.h
+++ b/src/v4/qv4_llvm_p.h
@@ -31,7 +31,7 @@
 #define QV4_LLVM_P_H
 
 #include "qv4global.h"
-#include "qv4ir_p.h"
+#include "qv4jsir_p.h"
 
 #include <QtCore/QString>
 
diff --git a/src/v4/qv4codegen_p.h b/src/v4/qv4codegen_p.h
index 13d8315c..283e2825 100644
--- a/src/v4/qv4codegen_p.h
+++ b/src/v4/qv4codegen_p.h
@@ -42,7 +42,7 @@
 #define QV4CODEGEN_P_H
 
 #include "qv4global.h"
-#include "qv4ir_p.h"
+#include "qv4jsir_p.h"
 #include <private/qqmljsastvisitor_p.h>
 #include <QtCore/QStringList>
 #include <assert.h>
diff --git a/src/v4/qv4dateobject.cpp b/src/v4/qv4dateobject.cpp
index c44fab7f..554b8225 100644
--- a/src/v4/qv4dateobject.cpp
+++ b/src/v4/qv4dateobject.cpp
@@ -58,7 +58,7 @@
 #include <private/qqmljslexer_p.h>
 #include <private/qqmljsparser_p.h>
 #include <private/qqmljsast_p.h>
-#include <qv4ir_p.h>
+#include <qv4jsir_p.h>
 #include <qv4codegen_p.h>
 #include <qv4isel_masm_p.h>
 
diff --git a/src/v4/qv4errorobject.cpp b/src/v4/qv4errorobject.cpp
index c13c2131..df737083 100644
--- a/src/v4/qv4errorobject.cpp
+++ b/src/v4/qv4errorobject.cpp
@@ -56,7 +56,7 @@
 #include <private/qqmljslexer_p.h>
 #include <private/qqmljsparser_p.h>
 #include <private/qqmljsast_p.h>
-#include <qv4ir_p.h>
+#include <qv4jsir_p.h>
 #include <qv4codegen_p.h>
 #include <qv4isel_masm_p.h>
 
diff --git a/src/v4/qv4functionobject.cpp b/src/v4/qv4functionobject.cpp
index 79905146..d8f796a9 100644
--- a/src/v4/qv4functionobject.cpp
+++ b/src/v4/qv4functionobject.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include "qv4object.h"
-#include "qv4ir_p.h"
+#include "qv4jsir_p.h"
 #include "qv4isel_p.h"
 #include "qv4objectproto.h"
 #include "qv4stringobject.h"
@@ -50,7 +50,7 @@
 #include <private/qqmljslexer_p.h>
 #include <private/qqmljsparser_p.h>
 #include <private/qqmljsast_p.h>
-#include <qv4ir_p.h>
+#include <qv4jsir_p.h>
 #include <qv4codegen_p.h>
 #include "private/qlocale_tools_p.h"
 
diff --git a/src/v4/qv4globalobject.cpp b/src/v4/qv4globalobject.cpp
index 2454126c..e5192fa0 100644
--- a/src/v4/qv4globalobject.cpp
+++ b/src/v4/qv4globalobject.cpp
@@ -48,7 +48,7 @@
 #include <private/qqmljslexer_p.h>
 #include <private/qqmljsparser_p.h>
 #include <private/qqmljsast_p.h>
-#include <qv4ir_p.h>
+#include <qv4jsir_p.h>
 #include <qv4codegen_p.h>
 #include "private/qlocale_tools_p.h"
 
diff --git a/src/v4/qv4isel_llvm.cpp b/src/v4/qv4isel_llvm.cpp
index f0b8526f..2dee4a8a 100644
--- a/src/v4/qv4isel_llvm.cpp
+++ b/src/v4/qv4isel_llvm.cpp
@@ -78,7 +78,7 @@
 // with very unfriendly names that collide with class fields in LLVM.
 #include "qv4isel_llvm_p.h"
 #include "qv4_llvm_p.h"
-#include "qv4ir_p.h"
+#include "qv4jsir_p.h"
 #include "qv4string.h"
 #include "qv4global.h"
 
diff --git a/src/v4/qv4isel_llvm_p.h b/src/v4/qv4isel_llvm_p.h
index e7498636..0f34547a 100644
--- a/src/v4/qv4isel_llvm_p.h
+++ b/src/v4/qv4isel_llvm_p.h
@@ -55,7 +55,7 @@
 #endif // __clang__
 
 #include "qv4isel_p.h"
-#include "qv4ir_p.h"
+#include "qv4jsir_p.h"
 
 namespace QQmlJS {
 namespace LLVM {
diff --git a/src/v4/qv4isel_masm_p.h b/src/v4/qv4isel_masm_p.h
index acd6e5f6..0d3a5a15 100644
--- a/src/v4/qv4isel_masm_p.h
+++ b/src/v4/qv4isel_masm_p.h
@@ -42,7 +42,7 @@
 #define QV4ISEL_MASM_P_H
 
 #include "qv4global.h"
-#include "qv4ir_p.h"
+#include "qv4jsir_p.h"
 #include "qv4isel_p.h"
 #include "qv4isel_util_p.h"
 #include "qv4object.h"
diff --git a/src/v4/qv4isel_p.cpp b/src/v4/qv4isel_p.cpp
index cbf2e4cf..49cc3b33 100644
--- a/src/v4/qv4isel_p.cpp
+++ b/src/v4/qv4isel_p.cpp
@@ -1,6 +1,6 @@
 #include "debugging.h"
 #include "qmljs_engine.h"
-#include "qv4ir_p.h"
+#include "qv4jsir_p.h"
 #include "qv4isel_p.h"
 #include "qv4isel_util_p.h"
 #include "qv4functionobject.h"
diff --git a/src/v4/qv4isel_p.h b/src/v4/qv4isel_p.h
index cc1ebf08..7fabf3a2 100644
--- a/src/v4/qv4isel_p.h
+++ b/src/v4/qv4isel_p.h
@@ -31,7 +31,7 @@
 #define QV4ISEL_P_H
 
 #include "qv4global.h"
-#include "qv4ir_p.h"
+#include "qv4jsir_p.h"
 
 #include <qglobal.h>
 #include <QHash>
diff --git a/src/v4/qv4isel_util_p.h b/src/v4/qv4isel_util_p.h
index 4a928ad1..495371a6 100644
--- a/src/v4/qv4isel_util_p.h
+++ b/src/v4/qv4isel_util_p.h
@@ -31,7 +31,7 @@
 #define QV4ISEL_UTIL_P_H
 
 #include "qmljs_runtime.h"
-#include "qv4ir_p.h"
+#include "qv4jsir_p.h"
 
 namespace QQmlJS {
 
diff --git a/src/v4/qv4ir.cpp b/src/v4/qv4jsir.cpp
index c44af3da..fbac69ee 100644
--- a/src/v4/qv4ir.cpp
+++ b/src/v4/qv4jsir.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qv4ir_p.h"
+#include "qv4jsir_p.h"
 #include <private/qqmljsast_p.h>
 
 #include <QtCore/qtextstream.h>
diff --git a/src/v4/qv4ir_p.h b/src/v4/qv4jsir_p.h
index 50a52472..50a52472 100644
--- a/src/v4/qv4ir_p.h
+++ b/src/v4/qv4jsir_p.h
diff --git a/src/v4/qv4object.cpp b/src/v4/qv4object.cpp
index 3c7356b8..97bdcc01 100644
--- a/src/v4/qv4object.cpp
+++ b/src/v4/qv4object.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include "qv4object.h"
-#include "qv4ir_p.h"
+#include "qv4jsir_p.h"
 #include "qv4isel_p.h"
 #include "qv4objectproto.h"
 #include "qv4stringobject.h"
@@ -51,7 +51,7 @@
 #include <private/qqmljslexer_p.h>
 #include <private/qqmljsparser_p.h>
 #include <private/qqmljsast_p.h>
-#include <qv4ir_p.h>
+#include <qv4jsir_p.h>
 #include <qv4codegen_p.h>
 #include "private/qlocale_tools_p.h"
 
diff --git a/src/v4/qv4objectproto.cpp b/src/v4/qv4objectproto.cpp
index 21d61820..b4f38ddc 100644
--- a/src/v4/qv4objectproto.cpp
+++ b/src/v4/qv4objectproto.cpp
@@ -53,7 +53,7 @@
 #include <private/qqmljslexer_p.h>
 #include <private/qqmljsparser_p.h>
 #include <private/qqmljsast_p.h>
-#include <qv4ir_p.h>
+#include <qv4jsir_p.h>
 #include <qv4codegen_p.h>
 #include <qv4isel_masm_p.h>
 
diff --git a/src/v4/qv4regexpobject.cpp b/src/v4/qv4regexpobject.cpp
index d9abd513..ed0ef144 100644
--- a/src/v4/qv4regexpobject.cpp
+++ b/src/v4/qv4regexpobject.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #include "qv4regexpobject.h"
-#include "qv4ir_p.h"
+#include "qv4jsir_p.h"
 #include "qv4isel_p.h"
 #include "qv4objectproto.h"
 #include "qv4stringobject.h"
@@ -50,7 +50,7 @@
 #include <private/qqmljslexer_p.h>
 #include <private/qqmljsparser_p.h>
 #include <private/qqmljsast_p.h>
-#include <qv4ir_p.h>
+#include <qv4jsir_p.h>
 #include <qv4codegen_p.h>
 #include "private/qlocale_tools_p.h"
 
diff --git a/src/v4/qv4stringobject.cpp b/src/v4/qv4stringobject.cpp
index 437c3092..eab69891 100644
--- a/src/v4/qv4stringobject.cpp
+++ b/src/v4/qv4stringobject.cpp
@@ -58,7 +58,7 @@
 #include <private/qqmljslexer_p.h>
 #include <private/qqmljsparser_p.h>
 #include <private/qqmljsast_p.h>
-#include <qv4ir_p.h>
+#include <qv4jsir_p.h>
 #include <qv4codegen_p.h>
 #include <qv4isel_masm_p.h>
 
diff --git a/src/v4/v4.pro b/src/v4/v4.pro
index a96d0635..c644e458 100644
--- a/src/v4/v4.pro
+++ b/src/v4/v4.pro
@@ -17,7 +17,7 @@ CONFIG += warn_off
 
 SOURCES += \
     qv4codegen.cpp \
-    qv4ir.cpp \
+    qv4jsir.cpp \
     qmljs_engine.cpp \
     qmljs_environment.cpp \
     qmljs_runtime.cpp \
@@ -53,7 +53,7 @@ SOURCES += \
 HEADERS += \
     qv4global.h \
     qv4codegen_p.h \
-    qv4ir_p.h \
+    qv4jsir_p.h \
     qmljs_engine.h \
     qmljs_environment.h \
     qmljs_runtime.h \